Blackfin: nand: drain the write buffer before returning

The current Blackfin nand write function fills up the write buffer but
returns before it has had a chance to drain.  On faster systems, this
isn't a problem as the operation finishes before the ECC registers are
read, but on slower systems the ECC may be incomplete when the core tries
to read it.

So wait for the buffer to drain once we're done writing to it.

Signed-off-by: Andrew Caldwell <[email protected]>
Signed-off-by: Mike Frysinger <[email protected]>

diff --git a/drivers/mtd/nand/bfin_nand.c b/drivers/mtd/nand/bfin_nand.c
index f134ef100fed7515bb06b52b1d3c32e7a6a39d6e..6d3d45019cab85586d103c4c6f654f1afaade925 100644 (file)
--- a/drivers/mtd/nand/bfin_nand.c
+++ b/drivers/mtd/nand/bfin_nand.c
@@ -75,7 +75,7 @@ static void bfin_nfc_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 int bfin_nfc_devready(struct mtd_info *mtd)
 {
        pr_stamp();
-       return (bfin_read_NFC_STAT() & NBUSY ? 1 : 0);
+       return (bfin_read_NFC_STAT() & NBUSY) ? 1 : 0;
 }
 
 /*
@@ -132,6 +132,11 @@ static void bfin_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len
 
                bfin_write_NFC_DATA_WR(buf[i]);
        }
+
+       /* Wait for the buffer to drain before we return */
+       while (!(bfin_read_NFC_STAT() & WB_EMPTY))
+               if (ctrlc())
+                       return;
 }
 
 /*